generated from Code-Institute-Org/gitpod-full-template
-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
156 user story admin and office can view full orch rotas closes #170 #173
Merged
mikerae
merged 8 commits into
main
from
156-user-story-admin-and-office-can-view-full-orch-rotas
Oct 9, 2023
Merged
156 user story admin and office can view full orch rotas closes #170 #173
mikerae
merged 8 commits into
main
from
156-user-story-admin-and-office-can-view-full-orch-rotas
Oct 9, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- If user is staff (Office or admin): access programs dropdown with links disabled - If user is superuser: access admin. Else no access to admin. modified: templates/base.html
Update welcome screen for office users modified: string_rota/templates/string_rota/home.html Add testing for Update Sidebar and Update to readme modified: README.md new file: readme_assets/images/testing-issue156-1.png
Add Sections to context in home class modified: string_rota/views.py Add sections to sidebar for each project modified: templates/base.html Add testing to readme modified: README.md new file: readme_assets/images/testing-issue156-2.png
Add sidebar Links logic dependant on Group Office/Rota Manager modified: templates/base.html Update logic in Rota View to receive a section argument as **kwargs modified: string_rota/views.py Update path for toggle published/draft Add url for Rota_admin modified: string_rota/urls.py Add testing for 'Add View Rotas for Admin/Orch Manager' to README - NB. basic functionality works, but CRUD links do not work in this commit. The resolution of the CRUD server errors is the same as for Rota class view ie pass in the Section as **kwargs and isolate calls to request.user - player and section modified: README.md new file: readme_assets/images/testing-issue156-3.png
Add paths for add_sp_office, with additional section id argument modified: string_rota/urls.py modified: string_rota/templates/string_rota/rota.html Add logic to add_sp class setting section from sidebar modified: string_rota/views.py Add testing for Fix Bug-Admin add seating position to README modified: README.md new file: readme_assets/images/testing-issue170-1.png
For Admin User: In Views: Each CRUD Class accepts ssection_id as kwargs and sets the value of section. Each returns to a dedicated 'office' url modified: string_rota/views.py Fix for Add Seating Position: conditional routing modified: string_rota/templates/string_rota/add_sp.html modified: string_rota/templates/string_rota/rota.html Fix for Edit Seating position: conditional routing modified: string_rota/templates/string_rota/edit_sp.html Add dedicated office urls for each CRUD url modified: string_rota/urls.py Add testing for Fix CRUD for Admin Seating Position in README modified: README.md new file: readme_assets/images/testing-issue170-2.png
Update message in ToggleSeatingPlanStatus Class Add accepts section.id as kwargs in ToggleSeatingPlanStatus Class Add conditional return logic in ToggleSeatingPlanStatus Class Derive section form kwargs in ToggleSeatingPlanStatus Class modified: string_rota/views.py Add conditional routing for Draft/Published Button modified: string_rota/templates/string_rota/rota.html Add toggle_seating_plan_status_office path modified: string_rota/urls.py Add testing of Admin Toggle Draft/Pubished rotas to README modified: README.md new file: readme_assets/images/testing-issue170-3.png
Remove Register User from Admin login temporarily to ensure pull request is robust. modified: templates/base.html Add conditional rendering for login as Admin/Rota Manager in Reserve class Add **kwargs to pass section.id into Reserve class modified: string_rota/views.py Add reserve_office url modified: string_rota/urls.py Add conditional Allocate Reserve button url modified: string_rota/templates/string_rota/rota.html Add conditional cancel button url modified: string_rota/templates/string_rota/reserve.html Add testing for Add Admin Allocate reserve to README modified: README.md new file: readme_assets/images/testing-issue170-4.png
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.